Clean-Up

Signed-off-by: Joe Snell <joesnellpdx@gmail.com>