Requirements cleaned up and consumer cleaned up