Include remove capability

If you can add the control to the map, you should be able to remove it
as well.