Merge "Remove deprecated clamp jobs"