This also removes the need for the cleanup function. Instead the cleanup
code is moved in place.