Lots of cleanup. Removing CameraSelector as it is causing segfaults and
needs to be re-done