Continue table cleanups