Change g++ to clang++
Miscellaneous removal
Simplify Rnd header