Removing unnecessary clear impacting performance