Remove some completed TODO statements