Remove TODO - issues now in bug tracker