more cleanups to tables