MacPython -vv equivalent printed incorrect filenames, fixed. Also

removed some outdated code.