Cleaned up some old file references.
Merge remote-tracking branch 'origin/master'