simpler removal code