Revert "One X Device support"

This reverts commit 17dd4bbfd600aac7dbb33b0009ecc7984f712254.