Revert "CwMcuSensor: clean up"

This reverts commit 612a9bc807c19a198ba66cbf17ec63a5cf9b8f2b.