A bit more cleanup of dependencies