Cleaned up code

Deleted "dead" comment lines and unused functions