Remove device dependency