Added unlisten for control/controller