Cleaned up some leftovers from the restructuring.