cleanups from code review #1906