Revert "Preparation for final IoT Demo"

This reverts commit 2b19903bebc2da469384e1212844ff75f01202d0.