JavaDoc cleanup, removed unnecessary classes