remove cfn and defcfn macros