remove some TODOs and commented-out test code