1455 Clean up the trigger code