Remove ammap from project - reverts 129cd8be78515