Cleaned up client event subscription