Use a more sensible query that I didn't write while half-asleep
Move prepararation to notify and delete subs to triggers