WL-2562 Unused imports removed