Fix cmd+opt+v (cleanup)