Removing some commuted code