Format changes
Merge Uninstall2 into Uninstall