Simplify schema
automatically create new accounts
remove old scope types