Still more repo cleanup