cleaning out TODOs