clean up util imports