MULE-8173 - using static imports and removing unused import