Final Commit before the demo

Removed some old commented out code.