Clean up unneeded dependency inheritances
3 files changed