Refactoring, more removing of full descriptors