Further reduce top-level dependencies