Removes the code with the manual user addresses fix.
Merge pull request #3462 from sergii-tkachenko/manual-fix-user-code-cleanup

Removes the code with the manual user addresses fix.