Removed superfluous code
Put common code in common place
code cleanup
Simplefied CodeProjectUrlScheme
Some updates