remove debug code from intrinsic plugin / improve intrinsic plugin