Repo cleanups