repo cleanup p1