Deleted switch class : not needed