Added untagging, cleanup