clean up version handling

Change-Id: I75ad498b2e7cd71726d991f492f10787157f59e2