Fix EZP-21928: Unused use statement should be avoided, take 2

https://jira.ez.no/browse/EZP-21928

Relates to #611