Remove some old stuff
Progress on proper file I/O