Added Handler removing feature