Added clean on full build
More build work