Removed some randomized TODOs