Cleaning up some leftovers