More cleanups on #09