Cleaned-up dependencies