Some cleanup, squash this before PR.