Cleaned up the project

Removed some temporary debug objects and removed some dead code.