remove switch stament