todo cleanup - 48 todo's to go + todo's in source