- CHG: code cleanups