Few TODOs removed.