Removed un needed evaluate