more cleanup for app escape mode