Implemented event sourcing, cleanup