Merge "Remove unnecessary clears"