more table cleanups