Removed safe_eval (must have done this in so branches by now)