removed old switch stuff