that's ok, feel free to put this sort of clean up in seperate commits, wasn't sure what it had to do with login token