Remove unused code

Closes gh-2244
Merge branch '1.1.x'