Camera fix attempt + Cleanup