finished moving ScopeRegistry and References stuff to classic API