Remove old code from removeTags