Removing 'unnecessary' SIGALARM code (including one TODO).