Cleanups and rework what events are sent to the client