Update Cut: rename classes, simplify interfaces, remove trash.