Cleanup for #37