removed deprecated method
new comments, deprecated variable removed
new comments