Removed forgotten TODO keywords