Should this commented-out area be removed too?