Fix tracking GET requests
Remove some old code