refactor for removing Fatal amap