[Misc] Removed 2 more deprecated calls
[Misc] Removed 2 more deprecated calls + fixed javadoc