Remove more possible tracker conflicts
Other files