Remove traces of enums,funcs support.