Code cleanup
Significant progress to new camera system