Clear up some stuff