even more repo cleanups