Removed everything HStore related