Merge pull request #283 from rrthomas/master

Remove some dead imports