budino88- another drunkstream cleanup