SLING-4155, clean imports