Remove xorg class

Change-Id: Ibc86a265408ec45f31c6a212b0729587c1351d6a