Do all thing needed in Kill function. Fixes tests