cleanup and moved map