INT-3217 Polishing

PR Comments

Also fixes some other warnings (mainly unused imports).