More repository cleanup