cleanup:
- remove code that was commented out instead of being removed
- reordered stuff in Scope to have all things about mappings in one place