Final ID class cleanup.