Freed dependency variables, removed unused dependencies, and misc. cleanup.