Some cleanup on clang
Cleanup in prep for release of 1.0.68