Cleanup of code: deletion of fun_val_orig