Cleanup controller, remove lots of commented code