Java fileservice cleanup

Java fileservice cleanup