Tallinn 1688 cleanup