Code Cleanup: Add Device Wizard

.. just comments