Clean Up

Signed-off-by: Jo Albright <jo@highfive.me>