Removing the unused code from WebViewListener and fixing issue with command class.