Removed more dead code.
Merge branch 'master' into staging