Remove old cruft.
Improved file reading.