deleted the TODO comments