Comment out unused dependencies.
Adding TODOs.