Remove unused import and functions.
Changelog closes #422