REFAC: default data store scope

• it shouldn't be required to add scope=general to all data store calls, this should be the default scope
• remove general from all datastore statements