Deprecated API usage cleanup, part2

Fixed, but we really improve this. Will get on it soon. i have task for that open some time now.