Complete Tomb2 intergration, clean up needed.