Commenting old consumers out.
Remove unneeded imports.