swrap: split out swrap_remove_wrapper() to handle swrap_close() and swrap_remove_stale()