make lint-contents more robust
remove OurPkgVersion