Cleaned up some code

Removed some old commented code