remove unused callback_handler
code cleanup
update todo list