Minor Scope fixes, remove unused Scope subclasses