Cleaning up unused imports. Comments