Remove saving of amap