Removing enumeration logic