Clean up all code for creating new version
Add mock interface