Continued todo cleanup