Simplify usage
Actually deprecate in API.