This block has been commented, could we remove it ?