Removing unused code
Merge branch 'release/2013.11.27'