cleanup for #52