code cleanup
conflict in cameravc.m