The big cleanup
build