Some more repo crap cleanup