Remove ancient back-compat code