Cleaned up the camera subsystem