Optimized some imports by removing things we don't need.