More cleanup on table