Uncomment remove event emit