Cleanup for #30