cleaning up some stuff about how we use_flatfile and test cloud