Some general repo cleanup