Remove redundant indexes
Rollback statements - just in case.
Fixed some of the complaints coming from JavaDoc when it parses the source files.
Merge branch 'master' into redesign-2013