All TODOs removed