WIP: Sink edges and cleanup harvest