Removing some unneeded lines of code