Clear map after close
Move clear map from close method
Fix typo
Add WindowUploader