Removing intra-module pub/sub