Remove remnants of "extended version" config

Change-Id: Iac5b021c61201cf4eb95addae884e63f786c97b1
Merge "Remove remnants of "extended version" config"