Make sure id is included when removing a map