Remove unused portion code