Of/cleanup warnings deprecations