TODO comments removed