more leftover code in parser