Cleaned up some leftovers.