Remove unsupported devices & cleanup

Change-Id: Idb62d1ee71e2e193cd71b7fca03362c01b47771e