Remove device check