Remove use of instance_eval