Bug fixes for removing training events