#361 Remove dumb parser stuff thingies