Removed more weak references

listeners get garbage collected and everything stops working