TODO comments re delete()