WIP: gnome-boxes: clean-up