removed unused scopes and accompanying tests