Should this commented out block still be here?