Code cleanup for Uri and Utilities
Code cleanup in Registry and String