Clean up for #85