Remove the 'remove' method and only call callbacks if provided