removal of deprecated APIs, various fixups