Avoid generating unnecessary TODO statements in the code