modified onCmdComplete method and removed file, code that are not needed
merge yasuda works