31453 code cleanup