remove quit state, improve consumer