Remove deprecated doc blocks
Fix doc blocks for API doc update
Update API Docs
Fix typo