Collapsed "remove" into the "dispose"