A bit more cleanup of stuff that shouldn't be in a repo anyway