Fix imports
Clean up dependencies