removing sort of switch