remove obsolete handler-chain
Merge origin/master