removing extra PublicSafetyApp