This fixes removals of the pid files and clean exit in the init script

Reviewed-by: iustinp