cleanups from review #1023879