update main parser header and code, remove XaoS deps