diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp
index fce50914a..c8b3b5f16 100644
--- a/libsolidity/analysis/PostTypeChecker.cpp
+++ b/libsolidity/analysis/PostTypeChecker.cpp
@@ -178,7 +178,6 @@ struct ConstStateVarCircularReferenceChecker: public PostTypeChecker::Checker
 
 	bool visit(Identifier const& _identifier) override
 	{
-		// TODO add user defined operators?
 		if (m_currentConstVariable)
 			if (auto var = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration))
 				if (var->isConstant())
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index b15598df0..a9f7abd21 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -314,7 +314,6 @@ struct MemberAccessAnnotation: ExpressionAnnotation
 
 struct OperationAnnotation: ExpressionAnnotation
 {
-	// TODO should this be more like "referencedDeclaration"?
 	FunctionDefinition const* userDefinedFunction = nullptr;
 };
 
diff --git a/test/libsolidity/semanticTests/operators/custom/all_operators.sol b/test/libsolidity/semanticTests/operators/custom/all_operators.sol
index 607b6cf4f..ea651773f 100644
--- a/test/libsolidity/semanticTests/operators/custom/all_operators.sol
+++ b/test/libsolidity/semanticTests/operators/custom/all_operators.sol
@@ -60,7 +60,6 @@ function geq(Int x, Int) pure returns (bool) {
     return uw(x) >= 10;
 }
 
-// TODO test that side-effects are executed properly.
 contract C {
     function test_bitor() public pure returns (Int) { return w(1) | w(2); }
     function test_bitand() public pure returns (Int) { return w(1) | w(2); }