removed device and other stuff to enable production