cleaning up deprecated apis and warnings