Switch counting down consumer to DefaultConsumer
Remove unused imports