Tidy up of the build process