Cleaned up Delete to work with the fixed API. Thanks, Dave!