Along with this removed unused code and wrong references in java doc. Change-Id: I8b2fd8065f582f60cde5ada0e1669515b6a60f3f