#398 removed unused code.