Fixed bugs with removing O.o() listeners