remove some useless codes
merge finished.
Torpedo.jar updated.