Cleanup/ version update