refactor upgrade ID
remove uid
fixes #122