Remove remaining traces of unneeded messenger variable