Removed generation of token from save