Use nestor builtin track implementation
Remove unneeded template