Clean up imports and update requirements