Rewrote remove as a scope function