expand JavaDoc, remove obsolete objects