Removing code for the unused 'upgrade path'

Change-Id: Ib9eca92284b0eabbe36ffaaf26c62a6ce3cfd3e9
5 files changed