clean up code remove unused imports