Tidy away some unused files
Improve debug logging on IOException