manage todos
remove dead code