More clean of unused event stuff. Single point of closure serialization created.