- Some cleanup
- Removed  override type ScopeType = FriendsScope