Fixed/Removed all possible TODOs