Implement delete proxy trap

See #2213