clean-up

hopefully using base-switch will work now...