Added trigger and column cleanup