Remove the ugly device hack