Clean build
Revert "Clean build"
Prepare for v1.6

This reverts commit 3242cbe064c6320be1b811162b71c3e4d9012d19.
Clean build v1.6