shonky bugfix
cleanup
removed listener to self