Cleaner dependency mgmt implementation