Cut out old lexer/filereader