Housekeeping: remove duplicated code
v3.3.0-SNAPSHOT
Switch to Break Versioning