IExpression and BuiltIns cleanup