Fix c4d4d51417e8a4d16eee8f984c554c56d10fb486

Moving the cleanup steps to a cleanup function is no good if we
don't call it...