removed TODO comments