Removed old Surface class