fixed mapping not being correct thus not removing correct push events