Remove useless hanlder adapter