switch to delete+local from clear_* methods