some warnings removed