commented out tenant / user undo logic