Remove dead code

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Clean up some formatting

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>