File cleanup after the Linux/Housekeeping...

File cleanup after the Linux/Housekeeping/Bug fixes/Extend xTreme/Def
commit. Should bring master in sync.