removed unused events and refactored mobile app