More clean more better more SIGTERM
Looks like it's working now.