Removes the dependency to Tabris tracking