Remove code that has become unnecessary after sysupgrade changes