Descriptor files cleanup