remove unused portion of code, code cleanup