#692 more slack cleanup