Eliminate use of custom txt format