Added code to remove and add triggers