Removed TODO item since it was done a while ago.