Misc cleaning up

Gotta continue getting old drivers out of core integration..