Cleaning up
Removed cruft
Removing commented out code