Remove Display class as it never served the purpose it was meant to