Changed remove to return the object if it removes itself