fix various redundant deps, and other issues