Use format.unmount() instead of custom unmount function
Use status for swaps instead of custom function