Untrack more stuff