Add missing app and remove unused parts