Cleaning up old scaffolding

Signed-off-by: J.C. Woltz <jc.woltz@ludowici.com>