move to file store, get rid of utils, other cleanup