deprecated warnings removed