Merge "Cleaning up comment removal and version replacement"