Some warnings removed