Version handling cleanup