OGM-471 Don't create associations prior to deletion