scrubbed more down, removed some orphaned commands/strings/functions etc...