Removed cruft to support app's change of focus