Add `unjoin` to cleanup joins