Get rid of the FileParser class