Revert "Added a handler"

This reverts commit 084d578eddf981f0b37eaea14418b748aa4cbf2d.