31453 31498 code cleanup