Cleanup community service

Cleanup community service
Merge pull request #1489 from CarlosManias/java-refactor-clean-communityservice

Java refactor clean communityservice