[MOD] cleaning up the cascading listeners
This would be the last commit before re-submitting and cleaning the patch