Updated legacy. Removed out of device repo