Deleted unnecessary rows in switch