try to improve speed of cross generator, remove hard tabs from store