Changing more text from void to delete - TRUNK-2894