add cleanup step to remove redundant return;

void functions do not need to return; at the end. The empty return was
left over after removing the RET() macro in
f7344c42 and
3e916da0

(cherry picked from commit d9e29d13)