Remove cdefs from class