cleanup for #23