(24)webservice refactoring

remove commented code