Deprecated API usage cleanup, part2