cleanup some todos