organize and remove unused imports