Cleaned up frameworks_av patch