Removed all calls to fileinfo class