cleanup dev target
simplify the parser inclusion mechanism