remove commented out code; remove todo comment