More cleanups, thanks Mike