remove device control for now

Change-Id: I68e5fc42530b241127d9fe9c2e92737a218f7eb0