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