removed all TODOs