Revert "spacing"

This reverts commit f3b772519f1fad581ff4dd5ba04ce2f04a52068f.
Revert "MCC fixes, future device prep"

This reverts commit 33de8f05391bd09b2fb5a5d54ecab7bf7b58a473.