Inter module dependency cleanup.