Parser clean up [CI SKIP]