Stripped out completed/obsolete TODO statements