more multi-module dependency cleanup