V2

Clean old version up to a single branch