[Panda] Final clean up.