cleanup and v1.6
cleanup and v1.6