remove redundant imports, comment unused code