version change and cleanup