Cleaning up uses

Getting rid of unused `use` statements