removing last of the code duplication

Signed-off-by: Bram Vogelaar <bram@attachmentgenie.com>