clean up some stuff...