Remove broken beforeRemove callback