Some more generic cleanup to get a properly set-up machine.