Updates for Tags, Cleanup