CVS references removed and special case reconducted to normal case