Revert "fist mapplication"

This reverts commit 80133c5667ad515d172850ab6b90553991c93320.