More cleanups after the last merge