event removal 4.4 (rebased onto develop)



This is the same as gh-1951 but rebased onto develop.

----

Minor string stripping. Previously checked by @manics and @sbesson.