Fix for #933 issue

This PR fixes #933, and some minor glitches detailed in the commit messages.
This class is never used, don't import it.