cleanup
removed unused code
Merge remote-tracking branch 'origin/amsterdamDemo'
Merge remote-tracking branch 'origin/amsterdamDemo'
extension to replacing NsPrefrixes