cleanup for #3