Load Master Password Window before credential storage window and before provisioning.
Remove unused method and variable.