removed iswitchb usage, as it is deprecated