Revert "Linux/Housekeeping/Bug fixes/Extend xTreme/Defs"

This reverts commit 8a4bcae8d89f2e7174a9dc0ed6ebce291289febd.

Most recent 3 commits don't work, keep going.