24433 - cleanup

Removed commented code to make sure the new dir/tool-chain works for me
Merge branch 'master' of https://github.com/gsn/cdn