updated to remove tables