Remove deprecated enumerator and code