Update parent version and remove temporary overrides.