Added removal for map items