Removed unused function
Remove unnessisary code
Reformat function generateFileDescriptors
Use MakePropertyValue