clean up some code
BS-7442, add export of custom user info definitions