Two further incorrect 'use' statements. Removing these completes the cleanup.