WIP: Eliminate indirect imports