Bit of tidying up of build process