Fix typo.
Fix dependencies.
Remove extraneous dependencies and variables.