More cleanups, thanks again Mike