Remove some outdated bitfive conditionals