Cleaning up unused imports