More repo cleanup