Clear up some vars