cleanup TODO's