WIP: Eliminate indirect imports
Eliminate indirect imports