WL-3332 Tidy imports