CodeManager cleanup: (#16468)