fix a bad dependency and a few unneeded refs