Cleaned up CommonPaths some more and removed BuildCompleteFilename()