Merge "Removing unused imports and swiching off deprecated APIs"