Fixed desktop.ini generating errors
Dead code removal and one reordering.
Merge branch 'Startup_Update'