Fixes: Merge the saveAction() function in the unload function.

Details:  Found while reading the code. It was only used in that
function anyway, and this simplfies the code a little bit and
removes some dubious left over.