Cleanup of old version
Preliminary commit of v2