DefaultSHKConfigurator improvements

Also Demo's configurator is getting out of sync so it would be probably better to remove all redundant code and comments from there.