Code cleanup

Removed unnecessary code and commented out code