minor code cleanup and a null check.
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Removes files that should never have been committed
Completes: U4-4369 Remove the need for an Areas folder for the installer