CR Fixes for safe_eval
Removed useless code