more table cleanup and package changes