Then may be we should remove this completely?