TRUNK-2894: Change all void references to delete in interface