removing unused imports, adding TODO, fixing internal code