Deprecated warnings removed