tidy up ActiveStore for server side