Removing some redundant steps.