Revert "a few more pieces todo"

This reverts commit 0abb81c7ce768c56f3a2463aa56703ef18cf40a1.