Initial clean-up of build