Task: added deprecation doc comments

and removed unused private class