CHANGE: Reduced the time that it takes to unload a map