Re-did earlier changes lost in commits

Suppress warnings, remove unused imports