Remove unused import and functions.
Changelog closes #422
Merge branch '1.13' into 1.14