Revert "more fixie"

This reverts commit 9e77b3bcfeba6ff921eb1e52d13c208d43297695.
Revert "updates"

This reverts commit fc0edeb541e6b6a63acc07438c9d749892fc54c2.
Revert "final import of CAF drivers still have to cleanup"

This reverts commit 597dceaf632020de620d202ceee7d2c17807098f.