Trim dependencies
Tidy dependencies