Merge "Remove the unused tenant and user option in cleanup"