Clean up patches, add patch for camera