Removed deprecated imports