Better cleanup, and don't actually install docker