added function and trigger removal