Removing unneeded/indirect dependencies