Housekeeping

No major edits. Just deleting unused code.

Signed-off-by: Jordan Egstad <jordanegstad@gmail.com>