Revert "Turns out none of the stuff in depends was needed except for a few"

This reverts commit 3501995dc78305f59ca7b4e9979caeaea629e260.
don't do the inline comments