Remove intermeidate type (enum attribute type); remove replacePseudoFunc (has been migrated to resolver)