Clean up some leftovers