Revert "cleanup: these are used anymore"

This reverts commit b980497866ba5c8b2f5df729cdd30720008d8d5d.

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>