clean up schemas; fix storing refreshed token