fixed claim trust/untrust commands
clean up datastore class