Remove no longer needed compat utilities