Updated cleanup exec