Some repo cleanup