Remove unused life cycle hook
Fix bug where messages would be received in following test