FileService cleanup

FileService cleanup