Clean up dependencies and imports