No more cleanup

Cleanup happens immediately after build, there's no value in it being a separate function.