More cleanups as usual