Clean Entity, Event and Updaters systems