added TODO, removed unnecessary code