got rid of some todos