removed new device defines - in favor of struct based approach