Revert "Added handlers"

This reverts commit d725ea07538a20c65a07058a7f68d68bc4df6acb.