Continued cleaning up in Shell7Base