clean up, testing on Mac/Qemu