Issue #57: removed some unused imports