Clean up for #17