Clean up TODO comments