started cleaning up and removing CreateDeviceMixin