Remove 'Dictionary' from Class