Clean up some stuff after a second look