remove unused repository method
fix tests while migrating 2.7 to 3.0