Clean up unused uses

Getting rid of unused `use` statements