Remove code into mapa-core