upgrade process cleaning

removed a lot of uneeded if blocks and cleaned up repeated upgrade processes