Removed the Display class.
Fixed a dependency on the Display class.