Removing some redundant code changes