Cleanup: camera and remove fake fix