Remove TODO, remove unneeded quotes.