Refactor code. Use datastore directly on production.