UF-15: cleanup imports
UF25: organizing imports