Removed extra unused cases from event handler