More cleanups and picks