some small cleanup in shell7base