Cleaned up a few more unused imports. The warnings that remain are important :)