further tweaked gizmo.remove method to make it simpler.