remove usages of default scopes