Some cleaning up in shell7base