Removed callback functions for fixing ZEN-14350

Some changes that fix disabling of the button