Some cleanup as I understand the APIs