Cleanup arch add unit