===> Cleaning for echomap-0.7.2