Remove unnecessary handler
Merge remote-tracking branch 'origin/i0103'