clean up define masking, very minimal resolution and native exec logic