Removing some code