remove uuid code and old username-based persisted key names