Revert "new control device"

This reverts commit 9e5e05efa042146529d30517c33c26b6b4bdbc16.