crosbymichael Merge pull request #1874 from mrunalp/drop_unused_code …