Removing unneeded code from last commit