Cleaned up a lot of file references