Removed redundant code
Attempted to improve file support on Xbox One