remove superfluous comments, add TODO