Clear up some things