removing to_hs in export