e8johan Changed from overriding to using the *_remove ability