Remove Device Handler

Change-Id: Ieb5738bd60601cd91136d534b1c357d8c13a376d