Based off John's recommendation I pulled these two checks into their own function.  That way if we need to use these elsewhere, they are easy to move out, and are already documented.  I also improved the documentation for the remove call.