FileService cleanup

FileService cleanup
Merge remote-tracking branch 'origin/2.0.0-alpha' into java-fileservice-cleanup
Merge pull request #1447 from CarlosManias/java-fileservice-cleanup

Java fileservice cleanup