Dead code removal, modified AddFileExtensionData
lots of dead code removal
Deleted dead code, removed one-line-getters