Remove dependency-handling; fix