clean up some things around tracker announcement responses
some significant moving & renaming