Removed unnecessary lines of code

Fewer lines of code means fewer bugs