Remove static subscription collection, just use groups