Cleanup some leftovers.