Remove unused code.
Remove remainings of unused properprovider setting
Merge remote-tracking branch 'ivan-github/bug/remove-unused-code' into develop