Remove elder version of mapper and evaluate