get rid of TODOs