remove d6 uber modules from this branch
Remove the last of the d6 legacy code.

Mostly just to make things cleaner.