(cleanup) Add minor comment updates; Remove obsolete code