HPCC-10028 removeEntry() should pass the error message to the caller

Clean up to use a single function.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>