Removed Graphics-class (unnecessary layer)