Touch up some code

Removed some unnecessary code