oops, sorry, my bad. I was testing stuff, I don't know why it got into the commit.

Besides that, I sorta feel this pr shouldn't have any modifications on these files (besides the parsing fix for clip order < 0)