clean up code and centrify user keys