Cleanup WebService.java