differentiate between clean_up and sig_handler
Small fixes and a remove statement mutator

Fixes #3