CLN: Finally got everything clean. I feel much better

Signed-off-by: Spencer Lyon <spencerlyon2@gmail.com>