Cleanup and refactoring of consumer

Situation solver are consumer only and do not contain any event producing
procedures anymore