BLK: May Clean up version system

Change-Id: I733e59b3c846b2281c5e5f6b05afad6ef0b00462