cleanups

- CHG: code cleanups