more todo cleanup