New tagged build.
Simplification, refactoring, cleaning.