Moar effects logging and change of execution order so the removal event actually triggers after removal