[RJA-2342][fix] - Imports cleaned