Removed Renderer, added Camera, Cleanup