remove unless "TODO". review pass.