Cleaning up commented out code and stale classes