Remove unneeded lines of code