Version upgrade, redundant code removed.