Additional updates to the fix removal script