remove the useless handler
add logic handler processing