CLS-1439 : removed unused switch statements