Deprecated API usage cleanup, part2

Nice. :)