Cleanup some todos