Fixed a method call I clobbered accidentally in the last commit. Removed
old unused imports.