Major repo cleanups.