Removed 16_rh files, and other cleanup