Removed some unneeded lines of code