INT-3130: remove some deprecation and JavaDocs

Addressed PR comments