More internal cleanup