Automatically reset auth token on invalid auth
Removed unnecessary value sets
Updated todo