Removes duplicate device hack and debug printing