Remove support for dis- and enabling event handlers using commands