Revert "Fix Bugs"

Reverts DeviceConnect/DeviceConnect#16