[PDI-8288] Cleanup and adding versioning/version comments methods