Clean up some stuff