Clean up in-crate use statements

Clean up in-crate use statements #1538