dont rebind this.remove if already bound
tweaked the remove/wrap reference