Cleaning up some stuff.