Clean up imports and remove some dependency cruft