Minor cleanup

Removes unused imports and suppressions