Finish cleaning up 64b file support