Cleanup the event client struct, remove unused vars