Remove class support for now