Remove meaningless @TODO