Removed used private members.
Merge branch 'develop'