Removed unused code

Removed commented out code that was no longer in use.
Left some commented out debuggin code in place in case we need it while
finishing the project.