Removal of old enum system.