Begin clean up of app_registration.feature