Surface class removed