More repository cleanup..