no removelistener functionality
Merge branch 'removelistener' into jacob