hstore migration refactor/cleanup