removed todos from code