More removal of hstore vistiges, remove dead struct