Refactor camera, remove unused imports