Removed removing callback on onDestroy and added to close button.