Deprecated API usage cleanup, part2

Is there a JIRA for fixing them?