Removing some code from last commit