Remove some unneeded lines of code