Adding support to EXTRA_SCRIPT and removing kill