Drop duplicate compat code