Component upgrades & get rid of deprecated stuff