remove unused imports
structure changes
 continue  changes