Move task deletion to the signal handler. Worry abt container exit later..