#43: some clean up