TRUNK-2894: Change all void references to delete in interface
(cherry picked from commit 223acd86b40b7415a02eeb36d9188802acb88d08)