Final control migration and cleanup