simpler removal code
simpler removal code

josl/rbush,landonb/rbush,MazeMap/rbush,landonb/rbush,opentable/rbush,opentable/rbush,mourner/rbush,MazeMap/rbush,korczis/rbush,korczis/rbush,mourner/rbush,josl/rbush