Added clean-up to build.