- Some clean up and unification
- GraphicalDevice is not a subclass of Device