removed every thing on the swicher in the class (commented)