some clean up
new structure now compatible to default_parser